Add introspection annotations to gtk_drag_(source|dest)_set

Also move docs inline at the same time. Bug 610905.

diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml
index 3f899d314b2d1bed66f02ac7a8ade976aaaed564..7d127408d21dd3eb2dd139e78e9c0aa1493ef9d1 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -348,17 +348,14 @@ a widget.
 
 <!-- ##### FUNCTION gtk_drag_source_set ##### -->
 <para>
-Sets up a widget so that GTK+ will start a drag
-operation when the user clicks and drags on the
-widget. The widget must have a window.
+
 </para>
 
-@widget: a #GtkWidget
-@start_button_mask: the bitmask of buttons that can start the drag
-@targets: the table of targets that the drag will support
-@n_targets: the number of items in @targets
-@actions: the bitmask of possible actions for a drag from this
- widget.
+@widget:
+@start_button_mask:
+@targets:
+@n_targets:
+@actions:
 
 
 <!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 4e53ffad17a546d769d0d5f6e1cad2da1709c68e..c64ec619014ea692ccc6c98fdc5e5d89c0fd43d4 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1216,9 +1216,10 @@ gtk_drag_dest_set_internal (GtkWidget       *widget,
  * gtk_drag_dest_set:
  * @widget: a #GtkWidget
  * @flags: which types of default drag behavior to use
- * @targets: a pointer to an array of #GtkTargetEntry<!-- -->s indicating
- * the drop types that this @widget will accept. Later you can access the list
- * with gtk_drag_dest_get_target_list() and gtk_drag_dest_find_target().
+ * @targets (allow-none): a pointer to an array of #GtkTargetEntry<!-- -->s
+ *     indicating the drop types that this @widget will accept, or %NULL.
+ *     Later you can access the list with gtk_drag_dest_get_target_list()
+ *     and gtk_drag_dest_find_target().
  * @n_targets: the number of entries in @targets.
  * @actions: a bitmask of possible actions for a drop onto this @widget.
  *
@@ -2578,19 +2579,19 @@ gtk_drag_begin (GtkWidget         *widget,
                                  actions, button, event);
 }
 
-/*************************************************************
+/**
  * gtk_drag_source_set:
- *     Register a drop site, and possibly add default behaviors.
- *   arguments:
- *     widget:
- *     start_button_mask: Mask of allowed buttons to start drag
- *     targets:           Table of targets for this source
- *     n_targets:
- *     actions:           Actions allowed for this source
- *   results:
- *************************************************************/
-
-void 
+ * @widget: a #GtkWidget
+ * @start_button_mask: the bitmask of buttons that can start the drag
+ * @targets (allow-none): the table of targets that the drag will support,
+ *     may be %NULL
+ * @n_targets: the number of items in @targets
+ * @actions: the bitmask of possible actions for a drag from this widget
+ *
+ * Sets up a widget so that GTK+ will start a drag operation when the user
+ * clicks and drags on the widget. The widget must have a window.
+ */
+void
 gtk_drag_source_set (GtkWidget            *widget,
                     GdkModifierType       start_button_mask,
                     const GtkTargetEntry *targets,